Merge with xen-unstable-ia64.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 11 Nov 2005 09:47:43 +0000 (10:47 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 11 Nov 2005 09:47:43 +0000 (10:47 +0100)
commit5aa99be2153fd1301c9dd1cb2d0ffab1dda0e19a
tree047198899d2f84adb25fefffda6811d8765f84c0
parent63e31364a37d0cbe63b64a4bd78bd813bb398ccd
parentea475aded31f7421dfe66ed6c174b2390fab34bc
Merge with xen-unstable-ia64.hg